Add support for Korad KA3005PS #269
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I think this is the same as the velleman LABPS3005DN needs i'll try and check somewhere this week on mine |
|
That doesn't work. LABPS3005DN.txt |
Author
|
I'm not sure where you applied that patch? For this PR you'd need to add the I also see a change of |
Right, I took your patch, and added which did not detect my velleman. My patch I uploaded lets me detect my velleman, but does not get me to a functioning state. https://cdn.velleman.eu/downloads/80/labps3005dn_communication_protocol.pdf is the doc for my velleman btw. I was just hopeful your patch would work for my device, because you mentioned it needed the newlines, I'm sorry if I am highjacking the thread... |
MartinJM
force-pushed
the
add_device_korad_ka3005ps
branch
from
cf8934c to
c79a973
Compare
Author
|
It does look fairly close - the only real differences seem to be the
No worries! I have changed the code a bit to see if it will allow your device to connect properly as well. If it doesn't take too much work it'd be nice to add support for it as well! You'll need to apply something like the following patch for your device though: diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index c6b9b1f6..583252a3 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -76,6 +76,8 @@ static const struct korad_kaxxxxp_model models[] = {
{"Tenma", "72-2710", "", 1, volts_30, amps_5, 0},
{"Velleman", "LABPS3005D", "", 1, volts_30, amps_5,
KORAD_QUIRK_LABPS_OVP_EN},
+ {"Velleman", "LABPS3005DN", "", 1, volts_30, amps_5,
+ KORAD_QUIRK_VELLEMAN | KORAD_QUIRK_NEWLINE},
{"Velleman", "PS3005D V1.3", "VELLEMANPS3005DV1.3" , 1, volts_30, amps_5,
KORAD_QUIRK_ID_TRAILING | KORAD_QUIRK_SLOW_PROCESSING},
{"Velleman", "PS3005D", "", 1, volts_30, amps_5, 0},
diff --git a/src/hardware/korad-kaxxxxp/protocol.c b/src/hardware/korad-kaxxxxp/protocol.c
index 0ce7206e..b27d8f9c 100644
--- a/src/hardware/korad-kaxxxxp/protocol.c
+++ b/src/hardware/korad-kaxxxxp/protocol.c
@@ -229,8 +229,13 @@ SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
"VSET1:%05.2f", devc->set_voltage_target);
break;
case KAXXXXP_OUTPUT:
- sr_snprintf_ascii(msg, sizeof(msg),
- "OUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ if (devc->model->quirks & KORAD_QUIRK_VELLEMAN) {
+ sr_snprintf_ascii(msg, sizeof(msg),
+ "OUTPUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ } else {
+ sr_snprintf_ascii(msg, sizeof(msg),
+ "OUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ }
/* Set value back to recognize changes */
devc->output_enabled = devc->set_output_enabled;
break;
diff --git a/src/hardware/korad-kaxxxxp/protocol.h b/src/hardware/korad-kaxxxxp/protocol.h
index 43653d14..19aef882 100644
--- a/src/hardware/korad-kaxxxxp/protocol.h
+++ b/src/hardware/korad-kaxxxxp/protocol.h
@@ -40,7 +40,8 @@ enum korad_quirks_flag {
KORAD_QUIRK_ID_OPT_VERSION = 1UL << 3,
KORAD_QUIRK_SLOW_PROCESSING = 1UL << 4,
KORAD_QUIRK_NEWLINE = 1UL << 5,
- KORAD_QUIRK_ALL = (1UL << 6) - 1,
+ KORAD_QUIRK_VELLEMAN = 1UL << 6,
+ KORAD_QUIRK_ALL = (1UL << 7) - 1,
};
/* Information on single model */The |
|
Im probably doing something weird, but I am faling at applying your patch for my velleman ^^; I'll have another poke later on, my brain is a bit foggy atm i'm afraid. |
Author
|
You'll need to apply it on top of this PR. I think you tried to apply it on master right? I also forgot to add the newline quirk for your device - just edited it in, so you might need to grab it again. |
|
i first tried master, then this PR as a patch, then the other one. final: prev:
{
libsigrok = prev.libsigrok.overrideAttrs (prevAttrs: {
buildInputs = (prevAttrs.buildInputs or []) ++ [prev.nettle];
src = prev.fetchgit {
#url = "git://sigrok.org/libsigrok";
url = "https://github.com/sigrokproject/libsigrok/";
rev = "c79a9738f8643fe84998d95d0578ec1035235471";
hash = "sha256-Ogg7/8ZIqKejyp9HWLRa6DMWM7nxGgVMew+EbaNxCKo=";
};
patches = (prevAttrs.patches or []) ++ [
#../patches/269.patch
../patches/VELLEMAN.patch
];
});
}I don;t know if you are familiar with nix, but that is the last one i tried. |
Author
|
Ah I think something went wrong with my patch. I recreated it and double-checked this one, so it should work: diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index c6b9b1f6..3967a0fb 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -76,6 +76,8 @@ static const struct korad_kaxxxxp_model models[] = {
{"Tenma", "72-2710", "", 1, volts_30, amps_5, 0},
{"Velleman", "LABPS3005D", "", 1, volts_30, amps_5,
KORAD_QUIRK_LABPS_OVP_EN},
+ {"Velleman", "LABPS3005DN", "", 1, volts_30, amps_5,
+ KORAD_QUIRK_NEWLINE | KORAD_QUIRK_VELLEMAN},
{"Velleman", "PS3005D V1.3", "VELLEMANPS3005DV1.3" , 1, volts_30, amps_5,
KORAD_QUIRK_ID_TRAILING | KORAD_QUIRK_SLOW_PROCESSING},
{"Velleman", "PS3005D", "", 1, volts_30, amps_5, 0},
diff --git a/src/hardware/korad-kaxxxxp/protocol.c b/src/hardware/korad-kaxxxxp/protocol.c
index 0ce7206e..b27d8f9c 100644
--- a/src/hardware/korad-kaxxxxp/protocol.c
+++ b/src/hardware/korad-kaxxxxp/protocol.c
@@ -229,8 +229,13 @@ SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
"VSET1:%05.2f", devc->set_voltage_target);
break;
case KAXXXXP_OUTPUT:
- sr_snprintf_ascii(msg, sizeof(msg),
- "OUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ if (devc->model->quirks & KORAD_QUIRK_VELLEMAN) {
+ sr_snprintf_ascii(msg, sizeof(msg),
+ "OUTPUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ } else {
+ sr_snprintf_ascii(msg, sizeof(msg),
+ "OUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ }
/* Set value back to recognize changes */
devc->output_enabled = devc->set_output_enabled;
break;
diff --git a/src/hardware/korad-kaxxxxp/protocol.h b/src/hardware/korad-kaxxxxp/protocol.h
index 43653d14..19aef882 100644
--- a/src/hardware/korad-kaxxxxp/protocol.h
+++ b/src/hardware/korad-kaxxxxp/protocol.h
@@ -40,7 +40,8 @@ enum korad_quirks_flag {
KORAD_QUIRK_ID_OPT_VERSION = 1UL << 3,
KORAD_QUIRK_SLOW_PROCESSING = 1UL << 4,
KORAD_QUIRK_NEWLINE = 1UL << 5,
- KORAD_QUIRK_ALL = (1UL << 6) - 1,
+ KORAD_QUIRK_VELLEMAN = 1UL << 6,
+ KORAD_QUIRK_ALL = (1UL << 7) - 1,
};
/* Information on single model */ |
|
hmm, not sure what I am doing wrong: |
|
little bit more info: |
|
are you sending a newline, or the actual characters '\n' |
Author
|
You're doing nothing wrong, but your device is not responding to the Also just read your original diff again: and noticed that you're actually adding a literal backslash and then Can you try the following patch? It will take a while to connect, but might work for your device: diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index c6b9b1f6..824303f1 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -76,6 +76,8 @@ static const struct korad_kaxxxxp_model models[] = {
{"Tenma", "72-2710", "", 1, volts_30, amps_5, 0},
{"Velleman", "LABPS3005D", "", 1, volts_30, amps_5,
KORAD_QUIRK_LABPS_OVP_EN},
+ {"Velleman", "LABPS3005DN", "", 1, volts_30, amps_5,
+ KORAD_QUIRK_NEWLINE | KORAD_QUIRK_VELLEMAN},
{"Velleman", "PS3005D V1.3", "VELLEMANPS3005DV1.3" , 1, volts_30, amps_5,
KORAD_QUIRK_ID_TRAILING | KORAD_QUIRK_SLOW_PROCESSING},
{"Velleman", "PS3005D", "", 1, volts_30, amps_5, 0},
@@ -290,6 +292,17 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
ret = korad_kaxxxxp_read_chars(serial, len, reply, true);
if (ret < 0)
return NULL;
+
+ // Also attempt literal \\n for VELLMAN
+ if (ret == 0) {
+ ret = korad_kaxxxxp_send_cmd(serial, "*IDN?\\n", true);
+ if (ret < 0)
+ return NULL;
+
+ ret = korad_kaxxxxp_read_chars(serial, len, reply, true);
+ if (ret < 0)
+ return NULL;
+ }
sr_dbg("Received: %d, %s", ret, reply);
/*
diff --git a/src/hardware/korad-kaxxxxp/protocol.c b/src/hardware/korad-kaxxxxp/protocol.c
index 0ce7206e..b27d8f9c 100644
--- a/src/hardware/korad-kaxxxxp/protocol.c
+++ b/src/hardware/korad-kaxxxxp/protocol.c
@@ -229,8 +229,13 @@ SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
"VSET1:%05.2f", devc->set_voltage_target);
break;
case KAXXXXP_OUTPUT:
- sr_snprintf_ascii(msg, sizeof(msg),
- "OUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ if (devc->model->quirks & KORAD_QUIRK_VELLEMAN) {
+ sr_snprintf_ascii(msg, sizeof(msg),
+ "OUTPUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ } else {
+ sr_snprintf_ascii(msg, sizeof(msg),
+ "OUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ }
/* Set value back to recognize changes */
devc->output_enabled = devc->set_output_enabled;
break;
diff --git a/src/hardware/korad-kaxxxxp/protocol.h b/src/hardware/korad-kaxxxxp/protocol.h
index 43653d14..19aef882 100644
--- a/src/hardware/korad-kaxxxxp/protocol.h
+++ b/src/hardware/korad-kaxxxxp/protocol.h
@@ -40,7 +40,8 @@ enum korad_quirks_flag {
KORAD_QUIRK_ID_OPT_VERSION = 1UL << 3,
KORAD_QUIRK_SLOW_PROCESSING = 1UL << 4,
KORAD_QUIRK_NEWLINE = 1UL << 5,
- KORAD_QUIRK_ALL = (1UL << 6) - 1,
+ KORAD_QUIRK_VELLEMAN = 1UL << 6,
+ KORAD_QUIRK_ALL = (1UL << 7) - 1,
};
/* Information on single model */Might also be necessary for the other commands, not sure yet, we will see. Another option could be to change the |
Author
Newlines. Only noticed that you meant the actual characters just before my previous comment. For my device it's about newlines (or carriage-returns). A literal Edit: This clears up a lot:
Try the following patch: diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index c6b9b1f6..30d5d36a 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -76,6 +76,8 @@ static const struct korad_kaxxxxp_model models[] = {
{"Tenma", "72-2710", "", 1, volts_30, amps_5, 0},
{"Velleman", "LABPS3005D", "", 1, volts_30, amps_5,
KORAD_QUIRK_LABPS_OVP_EN},
+ {"Velleman", "LABPS3005DN", "", 1, volts_30, amps_5,
+ KORAD_QUIRK_VELLEMAN},
{"Velleman", "PS3005D V1.3", "VELLEMANPS3005DV1.3" , 1, volts_30, amps_5,
KORAD_QUIRK_ID_TRAILING | KORAD_QUIRK_SLOW_PROCESSING},
{"Velleman", "PS3005D", "", 1, volts_30, amps_5, 0},
@@ -282,7 +284,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
// TODO: check if adding the newline breaks some other devices - I cannot do so
// This is required for the KA3005PS
- ret = korad_kaxxxxp_send_cmd(serial, "*IDN?", true);
+ // TODO: check if adding the \\n breaks some other devices - I cannot do so
+ // This is required for the Velleman LABPS3005DN
+ // It does not break the KA3005PS
+ ret = korad_kaxxxxp_send_cmd(serial, "*IDN?", true, true);
if (ret < 0)
return NULL;
@@ -290,6 +295,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
ret = korad_kaxxxxp_read_chars(serial, len, reply, true);
if (ret < 0)
return NULL;
+
sr_dbg("Received: %d, %s", ret, reply);
/*
diff --git a/src/hardware/korad-kaxxxxp/protocol.c b/src/hardware/korad-kaxxxxp/protocol.c
index 0ce7206e..76672e4c 100644
--- a/src/hardware/korad-kaxxxxp/protocol.c
+++ b/src/hardware/korad-kaxxxxp/protocol.c
@@ -25,18 +25,22 @@
#define EXTRA_PROCESSING_TIME_MS 450
SR_PRIV int korad_kaxxxxp_send_cmd(struct sr_serial_dev_inst *serial,
- const char *cmd, bool add_newline)
+ const char *cmd, bool add_newline, bool velleman_literal)
{
int ret;
char* addition = "";
- if (add_newline)
+ if (add_newline && velleman_literal)
+ addition = "\\n\n";
+ else if (add_newline)
addition = "\n";
+ else if (velleman_literal)
+ addition = "\\n"; // Very weird one
- // 21 was chosen here because 20 is chosen in korad_kaxxxxp_set_value
- char newcmd[21];
- ret = sr_snprintf_ascii(newcmd, 21, "%s%s", cmd, addition);
- if (ret < 0 || ret >= 21) {
+ // 23 was chosen here because 20 is chosen in korad_kaxxxxp_set_value
+ char newcmd[23];
+ ret = sr_snprintf_ascii(newcmd, sizeof(newcmd), "%s%s", cmd, addition);
+ if (ret < 0 || ret >= (int) sizeof(newcmd)) {
sr_err("Error creating command: %d.", ret);
if (ret > 0)
ret = -ret; // make errors always return negative numbers
@@ -229,8 +233,13 @@ SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
"VSET1:%05.2f", devc->set_voltage_target);
break;
case KAXXXXP_OUTPUT:
- sr_snprintf_ascii(msg, sizeof(msg),
- "OUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ if (devc->model->quirks & KORAD_QUIRK_VELLEMAN) {
+ sr_snprintf_ascii(msg, sizeof(msg),
+ "OUTPUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ } else {
+ sr_snprintf_ascii(msg, sizeof(msg),
+ "OUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ }
/* Set value back to recognize changes */
devc->output_enabled = devc->set_output_enabled;
break;
@@ -277,7 +286,8 @@ SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
}
if (ret == SR_OK && msg[0]) {
- ret = korad_kaxxxxp_send_cmd(serial, msg, devc->model->quirks & KORAD_QUIRK_NEWLINE);
+ ret = korad_kaxxxxp_send_cmd(serial, msg, devc->model->quirks & KORAD_QUIRK_NEWLINE,
+ devc->model->quirks & KORAD_QUIRK_VELLEMAN);
devc->next_req_time = next_req_time(devc, TRUE, target);
}
@@ -303,26 +313,27 @@ SR_PRIV int korad_kaxxxxp_get_value(struct sr_serial_dev_inst *serial,
count = 6;
bool newline_quirk = devc->model->quirks & KORAD_QUIRK_NEWLINE;
+ bool velleman_quirk = devc->model->quirks & KORAD_QUIRK_VELLEMAN;
switch (target) {
case KAXXXXP_CURRENT:
/* Read current from device. */
- ret = korad_kaxxxxp_send_cmd(serial, "IOUT1?", newline_quirk);
+ ret = korad_kaxxxxp_send_cmd(serial, "IOUT1?", newline_quirk, velleman_quirk);
value = &(devc->current);
break;
case KAXXXXP_CURRENT_LIMIT:
/* Read set current from device. */
- ret = korad_kaxxxxp_send_cmd(serial, "ISET1?", newline_quirk);
+ ret = korad_kaxxxxp_send_cmd(serial, "ISET1?", newline_quirk, velleman_quirk);
value = &(devc->current_limit);
break;
case KAXXXXP_VOLTAGE:
/* Read voltage from device. */
- ret = korad_kaxxxxp_send_cmd(serial, "VOUT1?", newline_quirk);
+ ret = korad_kaxxxxp_send_cmd(serial, "VOUT1?", newline_quirk, velleman_quirk);
value = &(devc->voltage);
break;
case KAXXXXP_VOLTAGE_TARGET:
/* Read set voltage from device. */
- ret = korad_kaxxxxp_send_cmd(serial, "VSET1?", newline_quirk);
+ ret = korad_kaxxxxp_send_cmd(serial, "VSET1?", newline_quirk, velleman_quirk);
value = &(devc->voltage_target);
break;
case KAXXXXP_STATUS:
@@ -330,7 +341,7 @@ SR_PRIV int korad_kaxxxxp_get_value(struct sr_serial_dev_inst *serial,
case KAXXXXP_OCP:
case KAXXXXP_OVP:
/* Read status from device. */
- ret = korad_kaxxxxp_send_cmd(serial, "STATUS?", newline_quirk);
+ ret = korad_kaxxxxp_send_cmd(serial, "STATUS?", newline_quirk, velleman_quirk);
count = 1;
if (newline_quirk)
count = 2;
diff --git a/src/hardware/korad-kaxxxxp/protocol.h b/src/hardware/korad-kaxxxxp/protocol.h
index 43653d14..4540c831 100644
--- a/src/hardware/korad-kaxxxxp/protocol.h
+++ b/src/hardware/korad-kaxxxxp/protocol.h
@@ -40,7 +40,8 @@ enum korad_quirks_flag {
KORAD_QUIRK_ID_OPT_VERSION = 1UL << 3,
KORAD_QUIRK_SLOW_PROCESSING = 1UL << 4,
KORAD_QUIRK_NEWLINE = 1UL << 5,
- KORAD_QUIRK_ALL = (1UL << 6) - 1,
+ KORAD_QUIRK_VELLEMAN = 1UL << 6,
+ KORAD_QUIRK_ALL = (1UL << 7) - 1,
};
/* Information on single model */
@@ -105,7 +106,7 @@ struct dev_context {
};
SR_PRIV int korad_kaxxxxp_send_cmd(struct sr_serial_dev_inst *serial,
- const char *cmd, bool add_newline);
+ const char *cmd, bool add_newline, bool velleman_literal);
SR_PRIV int korad_kaxxxxp_read_chars(struct sr_serial_dev_inst *serial,
size_t count, char *buf, bool strip_newline);
SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,I doubt it will work at once, you'll probably need something like And maybe you also need the newline quirk? I don't think you do so I've removed it from the quirks now, but if it doesn't work, you can try adding it again as well. |
A literal '\n' is very weird to me, too! idno what the person that wrote that was smoking :P So I changed your last patch a bit, + {"Velleman", "LABPS3005DN", "QJE3005PV1.0", 1, volts_30, amps_5,
+ KORAD_QUIRK_NEWLINE | KORAD_QUIRK_VELLEMAN},And I changed ret = korad_kaxxxxp_send_cmd(serial, "*IDN?\\n", true);to ret = korad_kaxxxxp_send_cmd(serial, "*IDN?\\n", false);It seems it doesn't like ACTUAL newlines, at that 🤦 It now gets detected, but of course the rest doesn't work, because actual |
Author
|
Ah I just edited my previous response. See the patch there, that might still need some of your edits.
Ah that will be an issue for supporting both of our devices then. Mine must have a newline, and yours cannot have one... Maybe one different option: Can you try it with a carriage return ( Edit: Oh yeah your |
|
that last one isn't detecting it anymore at all... I'll poke at it some more tomorrow, thanks for the help! |
|
ok, you last patch works, if I change: Add QJE3005PV1.0+ {"Velleman", "LABPS3005DN", "QJE3005PV1.0", 1, volts_30, amps_5,
+ KORAD_QUIRK_VELLEMAN},set add_newline to false in the discoveryret = korad_kaxxxxp_send_cmd(serial, "*IDN?", false, true);So the patch that works atm isdiff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index c6b9b1f6..30d5d36a 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -76,6 +76,8 @@ static const struct korad_kaxxxxp_model models[] = {
{"Tenma", "72-2710", "", 1, volts_30, amps_5, 0},
{"Velleman", "LABPS3005D", "", 1, volts_30, amps_5,
KORAD_QUIRK_LABPS_OVP_EN},
+ {"Velleman", "LABPS3005DN", "QJE3005PV1.0", 1, volts_30, amps_5,
+ KORAD_QUIRK_VELLEMAN},
{"Velleman", "PS3005D V1.3", "VELLEMANPS3005DV1.3" , 1, volts_30, amps_5,
KORAD_QUIRK_ID_TRAILING | KORAD_QUIRK_SLOW_PROCESSING},
{"Velleman", "PS3005D", "", 1, volts_30, amps_5, 0},
@@ -282,7 +284,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
// TODO: check if adding the newline breaks some other devices - I cannot do so
// This is required for the KA3005PS
- ret = korad_kaxxxxp_send_cmd(serial, "*IDN?", true);
+ // TODO: check if adding the \\n breaks some other devices - I cannot do so
+ // This is required for the Velleman LABPS3005DN
+ // It does not break the KA3005PS
+ ret = korad_kaxxxxp_send_cmd(serial, "*IDN?", false, true);
if (ret < 0)
return NULL;
@@ -290,6 +295,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
ret = korad_kaxxxxp_read_chars(serial, len, reply, true);
if (ret < 0)
return NULL;
+
sr_dbg("Received: %d, %s", ret, reply);
/*
diff --git a/src/hardware/korad-kaxxxxp/protocol.c b/src/hardware/korad-kaxxxxp/protocol.c
index 0ce7206e..76672e4c 100644
--- a/src/hardware/korad-kaxxxxp/protocol.c
+++ b/src/hardware/korad-kaxxxxp/protocol.c
@@ -25,18 +25,22 @@
#define EXTRA_PROCESSING_TIME_MS 450
SR_PRIV int korad_kaxxxxp_send_cmd(struct sr_serial_dev_inst *serial,
- const char *cmd, bool add_newline)
+ const char *cmd, bool add_newline, bool velleman_literal)
{
int ret;
char* addition = "";
- if (add_newline)
+ if (add_newline && velleman_literal)
+ addition = "\\n\n";
+ else if (add_newline)
addition = "\n";
+ else if (velleman_literal)
+ addition = "\\n"; // Very weird one
- // 21 was chosen here because 20 is chosen in korad_kaxxxxp_set_value
- char newcmd[21];
- ret = sr_snprintf_ascii(newcmd, 21, "%s%s", cmd, addition);
- if (ret < 0 || ret >= 21) {
+ // 23 was chosen here because 20 is chosen in korad_kaxxxxp_set_value
+ char newcmd[23];
+ ret = sr_snprintf_ascii(newcmd, sizeof(newcmd), "%s%s", cmd, addition);
+ if (ret < 0 || ret >= (int) sizeof(newcmd)) {
sr_err("Error creating command: %d.", ret);
if (ret > 0)
ret = -ret; // make errors always return negative numbers
@@ -229,8 +233,13 @@ SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
"VSET1:%05.2f", devc->set_voltage_target);
break;
case KAXXXXP_OUTPUT:
- sr_snprintf_ascii(msg, sizeof(msg),
- "OUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ if (devc->model->quirks & KORAD_QUIRK_VELLEMAN) {
+ sr_snprintf_ascii(msg, sizeof(msg),
+ "OUTPUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ } else {
+ sr_snprintf_ascii(msg, sizeof(msg),
+ "OUT%1d", (devc->set_output_enabled) ? 1 : 0);
+ }
/* Set value back to recognize changes */
devc->output_enabled = devc->set_output_enabled;
break;
@@ -277,7 +286,8 @@ SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
}
if (ret == SR_OK && msg[0]) {
- ret = korad_kaxxxxp_send_cmd(serial, msg, devc->model->quirks & KORAD_QUIRK_NEWLINE);
+ ret = korad_kaxxxxp_send_cmd(serial, msg, devc->model->quirks & KORAD_QUIRK_NEWLINE,
+ devc->model->quirks & KORAD_QUIRK_VELLEMAN);
devc->next_req_time = next_req_time(devc, TRUE, target);
}
@@ -303,26 +313,27 @@ SR_PRIV int korad_kaxxxxp_get_value(struct sr_serial_dev_inst *serial,
count = 6;
bool newline_quirk = devc->model->quirks & KORAD_QUIRK_NEWLINE;
+ bool velleman_quirk = devc->model->quirks & KORAD_QUIRK_VELLEMAN;
switch (target) {
case KAXXXXP_CURRENT:
/* Read current from device. */
- ret = korad_kaxxxxp_send_cmd(serial, "IOUT1?", newline_quirk);
+ ret = korad_kaxxxxp_send_cmd(serial, "IOUT1?", newline_quirk, velleman_quirk);
value = &(devc->current);
break;
case KAXXXXP_CURRENT_LIMIT:
/* Read set current from device. */
- ret = korad_kaxxxxp_send_cmd(serial, "ISET1?", newline_quirk);
+ ret = korad_kaxxxxp_send_cmd(serial, "ISET1?", newline_quirk, velleman_quirk);
value = &(devc->current_limit);
break;
case KAXXXXP_VOLTAGE:
/* Read voltage from device. */
- ret = korad_kaxxxxp_send_cmd(serial, "VOUT1?", newline_quirk);
+ ret = korad_kaxxxxp_send_cmd(serial, "VOUT1?", newline_quirk, velleman_quirk);
value = &(devc->voltage);
break;
case KAXXXXP_VOLTAGE_TARGET:
/* Read set voltage from device. */
- ret = korad_kaxxxxp_send_cmd(serial, "VSET1?", newline_quirk);
+ ret = korad_kaxxxxp_send_cmd(serial, "VSET1?", newline_quirk, velleman_quirk);
value = &(devc->voltage_target);
break;
case KAXXXXP_STATUS:
@@ -330,7 +341,7 @@ SR_PRIV int korad_kaxxxxp_get_value(struct sr_serial_dev_inst *serial,
case KAXXXXP_OCP:
case KAXXXXP_OVP:
/* Read status from device. */
- ret = korad_kaxxxxp_send_cmd(serial, "STATUS?", newline_quirk);
+ ret = korad_kaxxxxp_send_cmd(serial, "STATUS?", newline_quirk, velleman_quirk);
count = 1;
if (newline_quirk)
count = 2;
diff --git a/src/hardware/korad-kaxxxxp/protocol.h b/src/hardware/korad-kaxxxxp/protocol.h
index 43653d14..4540c831 100644
--- a/src/hardware/korad-kaxxxxp/protocol.h
+++ b/src/hardware/korad-kaxxxxp/protocol.h
@@ -40,7 +40,8 @@ enum korad_quirks_flag {
KORAD_QUIRK_ID_OPT_VERSION = 1UL << 3,
KORAD_QUIRK_SLOW_PROCESSING = 1UL << 4,
KORAD_QUIRK_NEWLINE = 1UL << 5,
- KORAD_QUIRK_ALL = (1UL << 6) - 1,
+ KORAD_QUIRK_VELLEMAN = 1UL << 6,
+ KORAD_QUIRK_ALL = (1UL << 7) - 1,
};
/* Information on single model */
@@ -105,7 +106,7 @@ struct dev_context {
};
SR_PRIV int korad_kaxxxxp_send_cmd(struct sr_serial_dev_inst *serial,
- const char *cmd, bool add_newline);
+ const char *cmd, bool add_newline, bool velleman_literal);
SR_PRIV int korad_kaxxxxp_read_chars(struct sr_serial_dev_inst *serial,
size_t count, char *buf, bool strip_newline);
SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
log: Setting values works, reading them back does not. |
|
bit further poking it, sending Who the hell implemented this thing, and why did I end up with one? 😁 |
Author
Hahaha good questions :P
Hmmm I was hoping that either of these would work for your device, as then there would be overlap with my device as well. I'm wondering if we can just send Edit: So for my device it seems to be that it needs to start with |
|
I don't know if you are still wanting to know @MartinJM ... it seems you just append 'n' no |
I can SET values, and enable/disable the output, but sigrok-cli can't read them back it seems: Set / Read |
|
Yeah, so control works, but reading back doesn't. from smuview i can enable the output, but it doesn't see it is on, and the voltage readings jump all over the place... |
Author
|
Hey, yeah always interested in stuff like this.
And this is giving me a good laugh, so thank you for sharing. Is your device still fine if you send
Hmmm that's too bad. Is this with just the |
Yep, it doesn't seem to care about the \n, you just send the normal commands, and then 1 or 0 characters, and then an
either, if I run sigrok-cli -d korad-kaxxxxp:conn=/dev/tty-CP2102 --continuous |
Member
|
What's your take on this PR, @MartinJM? Should I merge it as-is or do you intend to make any changes to it? That said, please only use /* ... */ for comments, not // |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds support for the Korad KA3005PS. Protocol is almost the same as for the KA3005P, except that it needs a newline1 at the end of every request, and sends back a newline at the end of every response. That is added in this PR.
One thing to keep in mind: This PR also sends the newline for the
*IDN?to identify the device. I assume this will also work for the KA3005P, but I cannot check.Footnotes
It also seems to work with a carriage return, but the responses will still end with a newline. I've implemented it with newlines. ↩